bitkeeper revision 1.1313 (42641d28jw3IBtr_TG4yEG9VDljPEw)

With -D_FORTIFY_SOURCE=2 (which is used in the Fedora buildroot), gcc has certain defines for functions like read() to check that things are done right.

This trips up these function pointers, and gcc becomes unhappy.
Adding parens around the function prevents gcc from expanding read to the macro it is defined to internally, and makes things compile again.

Signed-off-by: Rik van Riel <riel@redhat.com>

diff --git a/tools/libxutil/iostream.h b/tools/libxutil/iostream.h
index 1efd8f998527503c4f0c49a2cd45193123720b3a..d2fd6fcce1a85f9b309bfc819ab14693acf3f845 100644 (file)
--- a/tools/libxutil/iostream.h
+++ b/tools/libxutil/iostream.h
@@ -114,7 +114,7 @@ static inline int IOStream_read(IOStream *stream, void *buf, size_t n){
         result = -EINVAL;
         goto exit;
     }
-    result = stream->methods->read(stream, buf, n);
+    result = (stream->methods->read)(stream, buf, n);
     if(result > 0){
         stream->read += result;
     }
@@ -139,7 +139,7 @@ static inline int IOStream_write(IOStream *stream, const void *buf, size_t n){
         result = -EINVAL;
         goto exit;
     }
-    result = stream->methods->write(stream, buf, n);
+    result = (stream->methods->write)(stream, buf, n);
     if(result > 0){
         stream->written += result;
     }
@@ -157,7 +157,7 @@ static inline int IOStream_flush(IOStream *stream){
     if(stream->closed){
         result = IOSTREAM_EOF;
     } else if(stream->methods->flush){
-        result = stream->methods->flush(stream);
+        result = (stream->methods->flush)(stream);
         if(result < 0) result = IOSTREAM_EOF;
     }
     return result;
@@ -171,7 +171,7 @@ static inline int IOStream_flush(IOStream *stream){
 static inline int IOStream_error(IOStream *stream){
     int err = 0;
     if(stream->methods && stream->methods->error){
-       err = stream->methods->error(stream);
+       err = (stream->methods->error)(stream);
     }
     return err;
 }
@@ -184,7 +184,7 @@ static inline int IOStream_error(IOStream *stream){
 static inline int IOStream_close(IOStream *stream){
     int err = 1;
     if(stream->methods && stream->methods->close){
-        err = stream->methods->close(stream);
+        err = (stream->methods->close)(stream);
         stream->closed = 1;
     }
     return err;
@@ -205,10 +205,10 @@ static inline int IOStream_is_closed(IOStream *stream){
  */
 static inline void IOStream_free(IOStream *stream){
     if(!stream->closed && stream->methods && stream->methods->close){
-        stream->methods->close(stream);
+        (stream->methods->close)(stream);
     }
     if(stream->methods && stream->methods->free){
-        stream->methods->free(stream);
+        (stream->methods->free)(stream);
     }
     *stream = (IOStream){};
     deallocate(stream);